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

Change-Id: I5f91ea6e826a24d37bf8c7f7cbcc49a235532a14