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

Change-Id: Ica224970dc296b82fb68e3e2b25dcb4e525d6b75