Merge changes from topic \'tethering-ownership\' into nyc-mr1-dev
am: 281ec3272f

Change-Id: Ia8b234bcfdd479ef1ecda6b9102cf7cd5b3f217c