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

Change-Id: I6d86ae8db2bea689c6db821c6924b4dcde6f7c41