Fix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169 am: 0517da2c5a am: b0dff427a1 am: 1852db9aa3 am: d4f7a66cf6 am: 0646227ad2 am: 8f2e06aaf3
am: 00b29980f2

Change-Id: Ia19d41e9c824b5ed6352834c2deefcbaf0220771