DO NOT MERGE Minimal commit for security test patches am: 098805a2d6 am: 5449298923 am: 77d13ce639 am: 17c87062c5  -s ours am: 3e5f1bb66a am: 78f3897ca8 am: 8586bc3c21 am: 46f3203c8b
am: a3fd7b9c72

Change-Id: I2a38fc2e965c05e3da501c8903e6944b81c3c307