[automerger skipped] Merge changes from topic "am-99b870448c8c43b2815c42861ac6235c-rvc-dev" into rvc-dev am: df554bb5f8 -s ours am: 404b1ce8c3 -s ours am: cea309034c -s ours am: b0b48b07ec -s ours

am skip reason: Change-Id I0b07a0b520dedb479bf863fbfe898ae85b84b0f3 with SHA-1 5475504266 is in history

Change-Id: I7c770a85156495a8881620e00232f89d77e64846
tree: 8d469ca9daee0dec4a6a8ccee8f9d06a49eae17a
  1. Tethering/