[automerger skipped] Merge changes I38628dad,I2467b647 into rvc-dev am: 027c80d2d6 -s ours am: 1a16968c3b -s ours am: 795f9abaab -s ours am: 78799f9ba2 -s ours

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

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