am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch...
am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit '9512a857':
Fix issue #23116383: Include security patch level in Settings