Merge "Check settings validators for NPE" into pi-dev am: 3a95d0bb94
am: 0b653bc5e4

Change-Id: I5afb8ce11e978bc2290cb1ef266b6b68e638fce1