Merge "Fix security vulnerability" into nyc-dev am: 2188ad799e am: 80672db6b8 am: 900cd6a1d2 am: c1038b66dd
am: 64cae76fe0

Change-Id: I4ede153f15364c3e261e5e93c896ee79a084c2ec