[automerger skipped] Merge changes I38628dad,I2467b647 into rvc-dev am: 027c80d2d6 am: 50815fdafe -s ours am: 97c8dc55c7 -s ours am: 800f070743 -s ours

am skip reason: Change-Id I38628daddcb7be7c74846e78d36dc88f065b97d9 with SHA-1 360c88f238 is in history

Change-Id: I55337224eb57f3bc38993db501debf96202ff80e
tree: 90e2a994c35fc691f9992996286fcdbb659c999c
  1. Tethering/