am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '00721b4afa3940138e82cd150bb6670239ec0b5b':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3