Fix security vulnerability am: 45b202513b am: 8778a131c2 am: 18a5e5f607 am: f91ee50667 am: b6fa70b9fb
am: cf5b13aa09

Change-Id: Ie17e65a29fb90934a04d8ece10f2309526a82def