am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security...
am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '7f96f4f6':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3