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 am: 2f2d060f91 am: 901d9cf9b6 am: 11d541356b am: 2b327f08af  -s ours am: bb503c285b am: a3c20e2dce am: 9d54471f23 am: 5516d3df8c
am: 28c7db9416  -s ours

Change-Id: I0ead817cef815c704b8b002fc0a19e28468cee13