DO NOT MERGE: Revert "Updating CTS Security patch to 2017-01" am: b7d13355b3
am: 7858dd2ad6

Change-Id: I388d07c58891b093d597c897a09612ad0d188690