am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit 'b2b3cecb':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings