Merge "Fix security vulnerability" into nyc-dev am: 2188ad799e am: 80672db6b8 am: 900cd6a1d2 am: c1038b66dd am: a27b8d6f0b
am: 0de664e6a8

Change-Id: I085a585040267aa6d72f84db65a9e77f38d4b455