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