am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security...
am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit 'c87ceb7e':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3