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

Change-Id: If15e3089b94f73cee3cb0a284b0a514cf433331b