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

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