Merge "Merge the following changes to tethering:" into rvc-dev am: 888d833d am: d52845a1 am: 23a6a80c Change-Id: Ie4d8d202f873eb72244ea6d907d0f506d2d2a5cc