am c4c52ccb: am 961d2f46: Merge "Disable camera and search from some security...
am c4c52ccb: am 961d2f46: Merge "Disable camera and search from some security screens." into klp-dev
* commit 'c4c52ccb':
Disable camera and search from some security screens.