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

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

Change-Id: I915f8687c015cef0e2562240bba858a8f6ae793d
tree: abd4c8b2cdf1a714aebfa3866128ec4107088cf7
  1. Tethering/