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