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

Change-Id: Ia659ed03d24cb444059f7fc6af2072e617a53dda