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

Change-Id: Ib23f9b7723b7989c54330f3d03d62570aa37ee60