Merge changes from topic "tethering-systemapi"
am: 8e34d95a22

Change-Id: Id22196cdbecd66b018f5458417d99548bb3a251e