Merge "DO NOT MERGE change name from CTS-sts -> security-bulletin" into klp-dev am: eb39e378a7 am: 9ed5b6c6b3 am: 920f1e5979  -s ours am: 5513323484  -s ours am: ad5cd8c386
am: 9d1ddf0e47  -s ours

Change-Id: I505b688d70c9cd9ddde78e3327932ce86bafc9f4