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

Change-Id: Ia4ab81ceb6f16145b4f10128fc64038e48d19b44