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