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

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

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