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

Change-Id: Iec4b5c921b77fd29aea45bdb49cd4d7cda67edc6