This fixes a couple of bugs I found while updating SecuritySettings. Change-Id: I9881cff71799ddf3c1d1493c2f7f3bfb31ca7774