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

Change-Id: I703ffd6b2a4ee5a7726bd7426f83256ad990835f