Merge "Replace limited connectivity notification after detecting it" am: b6482348 am: 7cfc1d4e am: a5c68348 am: 56aac804 Change-Id: I14385a39d99a45c4a6a50a665f456f589c2f4da3