Merge "Protect broadcasts we use to talk to settings" into pi-dev am: 3dbd752246
am: f65e34a95b

Change-Id: I658a1aef8695fe8bd64e93d623631b6ab3133fc2