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

Change-Id: I99bf0fb9e24742c0965d847eb7911b98eeb4a5b2