[automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa -s ours am: 6cc54c5b5c -s ours

am skip reason: Change-Id I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5 with SHA-1 482af2e2e8 is in history

Change-Id: Ia4f14c3b8538cafa45cf118ae7b7189f87927082
tree: 1babb1db341de1fd7a72132a91fbf8c92cd6fada
  1. Tethering/