Merge "Set the Security Patch level for MNC" into mnc-dev