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

am skip reason: Change-Id I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5 with SHA-1 595adc05e8 is in history

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