Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEAD

Change-Id: I14308d604566ff36070b220d0da1a3e5044a8694