Merge "Watch network subtype, tethering teardown, empty." am: 6d38bd1bc3 am: e1ddb1a6ad
Original change: undetermined Change-Id: Ia6fd3355437691923f8444b0852bb75ebea680c8
This commit is contained in: