Merge "Watch network subtype, tethering teardown, empty." am: 6d38bd1bc3

Original change: undetermined

Change-Id: I40f098b117dc0b9761446cf887bc6a2a3670b415