Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef am: aff7827b4f am: c8684d517a am: 57dbf1c224
am: b17adaa85f

Change-Id: I4259f7bbfafe66f7690c1ecd80f8c81a398ae78f