Merge "Protect early access before tethering ready" am: 2bfa6b55e4 am: ede35e955d am: 0bec442453

Change-Id: I7837cdd4cd18d3925f9198a5864a601df745039c