am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'b5173241d160a5b6f4d440a01c9a9b0281ee4e66':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings