DO NOT MERGE Minimal commit for security test patches am: 098805a2d6 am: 5449298923 am: 77d13ce639 am: 17c87062c5  -s ours
am: 3e5f1bb66a

Change-Id: Icf1c32425630fb0b15f970ad4ce6f552c436ad69