am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security...
am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '48e2b43e':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3