Merge "Implement untetherAll as calls to stopTethering" am: 7fd48d54de am: bce303a050
am: 9215efd10c

Change-Id: If33c9605aa0a1af08401ab9b6dd011decf1ec4ca