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

Change-Id: Ie4f7739d9a0403556abd6b506047f7d0658caeee