Merge "Merge "DO NOT MERGE: Revert "Updating CTS Security patch to 2017-01"" into nyc-mr1-dev am: 373a8b9397 am: f648b2aa3e am: 60e9d4fc77" into nyc-mr2-dev-plus-aosp