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

Change-Id: Id7056d166f5bcc7e919439ca4cb0fe62595e288c