Merge "Merge "Fix security vulnerability" into nyc-dev am: 2188ad799e am: 80672db6b8 am: 900cd6a1d2 am: c1038b66dd am: a27b8d6f0b" into nyc-mr2-dev-plus-aosp
am: 3e3a701e38

Change-Id: I6b36c03974b28612a89f55f3fc6c6e98a6169b3b