am: 3eb5851664 * commit '3eb5851664e0c604714f080fd1a812ca5edb321d': Covers more corner cases on restricted network modes: Change-Id: I459897d90c63e115bf7b88b15c270e08e1b25ed5
3eb5851664