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

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