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

Change-Id: Ieb4399ba0740fe711ab4459a7a196d58df111c2b