Merge "DO NOT MERGE ANYWHERE: bump cts for 201708 security public bulletin Bug:37328047 Change-Id: I488fb2e2f3cfcbe8f7645d10e8d532eb91fb519e" into nyc-dev am: ee89112359  -s ours am: fff2040f2f  -s ours
am: a95f351eb3  -s ours

Change-Id: I58465e984a8c7e9e8489c2dec2cfbb51098f38b2