Merge changes I4a624ea4,I8626932e am: 0f0bff0594 am: a081a0cbab

Change-Id: I691053b22cb0b20e49419212f378cc473b1f35dc
tree: 2dfa14440b70f4207d45108d51f8858957bbabb0
  1. Tethering/