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

Change-Id: I01f28fe0892728bfd82c9ef0d8123cbb2134ca0a