Merge "Updating CTS Security Patch to 2017-06 on mnc-dev" into mnc-dev