Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef am: aff7827b4f am: c8684d517a am: 57dbf1c224 am: b17adaa85f am: c261a17e51 am: ce40ad2441 am: 97ce922887
am: 95df778f8a

Change-Id: Ib4408703114f6c7ebd71c1f29deee2a79f105969