Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef
am: aff7827b4f

Change-Id: I2a759e2ecdf1c67cb764a9279da23386cfb54914