am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch...
am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit '6a1e1e08':
Fix issue #23116383: Include security patch level in Settings