am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch...
am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '897f3ba8':
Fix issie #23116383: Include security patch level in Settings