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

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

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