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

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

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