Merge "Updating CTS Security Patch to 2017-06 on mnc-dev" into mnc-dev
am: 43e940a082

Change-Id: Ia905d5e0d29a32d013a0a0d54f48bfb2a4934792