am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '825518b7':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3