Merge "Tethering: switch to use tethering package resources" am: 49b8c99f am: 01224e01 am: f1e67d5b Change-Id: I3f3ba0792f2ac0c4137381cbb6e49d533a136845