Merge "Fixes crash in security settings." into pi-dev
am: abe44c2674

Change-Id: I6d0730a148fbfecaaa4b94e376550af613ad174b