DO NOT MERGE: Updating CTS Security patch to 2017-01
am: 926d43e4f2  -s ours

Change-Id: Ifc4fd602caa2a15bec3146d86c285b36b5ebda4f