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

Change-Id: I84f5f6754dd963a80935fdc476e47fb208bfe76a