Merge "Always prompt for limited connectivity." into qt-dev am: 4a5a129fb2 am: 5d10721edc
am: 944ef4cb70

Change-Id: Ibdc959de22a42ffc9ddd428f5843d81ae60a1920