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

Change-Id: Ib14b4a7b3a5b8eb23c7229318ecd785605e1a4f0