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

Change-Id: I49c6fa4e733d05804495de9f5986d3430178d0f9