Merge "Fix wrong TetherProvisioningActivity definition" am: f1e3e9d627
am: 2ee5beaa32

Change-Id: Ifeb4b845b1842cff2096ec20bdd71e7ed4ea93be