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

Change-Id: Ib4fad8fa8a393bc6233b842f0550db03708a65b1