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

Change-Id: Ie90de6ee888c2a90a835bfb06cfd9c1eeadba100