am ba80596b: am f8cda089: 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 'ba80596bc0d51b3ddf14c1612c341992bc3ac5fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings