Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am: 89d138b724
am: d31d90eecf
am: 2279920944
Change-Id: Iccb6ae0dd0b8d584fd0c1121b7bb91bcbbd235e8
This commit is contained in: