Merge "Merge the following changes to tethering:" into rvc-dev am: 888d833d am: 9a823973 am: f599788b am: 74bf0aa1 Change-Id: I138f248d0edb3f232b32edcb9a40e550f4e77dcc