am: c88f39571c * commit 'c88f39571cb380f5bf1251c1f534dc857ede025d': Covers more corner cases on restricted network modes: Change-Id: Iffd229d78b2bd2f28825c7e74538855ba366a381