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