Merge "Fix security vulnerability" into nyc-dev am: 2188ad799e
am: 80672db6b8

Change-Id: I5008bd9cd2b14dd52d261f5934024f7526e96f7f