Merge "Fix wrong TetherProvisioningActivity definition"