Merge "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 am: d44ae2a3da  -s ours am: 24d892f86d  -s ours" into oc-dev
am: e9baf5ee7b  -s ours

Change-Id: I8cc54dbf574d54d3e2737fa021e923c152c8d33a