[automerger skipped] Merge changes I38628dad,I2467b647 into rvc-dev am: 027c80d2d6 am: 50815fdafe am: ea959b046a am: b0c6b797ab -s ours

am skip reason: Change-Id I38628daddcb7be7c74846e78d36dc88f065b97d9 with SHA-1 40092b1fa7 is in history

Change-Id: Id47978a13ba61df23e68a0f2cd0668fc5157674d
tree: ea79954e94e3e810904e7306a44a5122bc676526
  1. Tethering/