Merge "Updating CTS Security Patch to 2017-06 on mnc-dev" into mnc-dev am: 43e940a082 am: 8b0e642413 am: 5e77ff481b
am: 536c5864e9

Change-Id: I84e75cbd89cd5039e3258697b3d92562ff876228