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

Change-Id: If10a72b8c856955a543cf695133b72161192b00b