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

Change-Id: Ia5cc5d4825d4ec3a8fd9ad9d3ffc309ce4dd740d