am 4535d7cb: (-s ours) am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev

* commit '4535d7cb345d82b627030eb19fc12c3ac6e95676':