Merge "DO NOT MERGE change name from CTS-sts -> security-bulletin" into lmp-dev am: 54c7708f5e  -s ours am: 17c4d2959b am: 1af6172cdf  -s ours am: c640dacf50 am: d8a54b7058
am: 0e270687c1

Change-Id: Ib0dde7cb585f820111776debcf158240616f8ff2