[automerger skipped] Merge "Establish permanently unavailable settings" into pi-dev am: ab68a8107c
am: 57c000113f -s ours
Change-Id: I2f4b619271e987fc42991458b677307303e414f7
This commit is contained in: