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

Change-Id: Ibf1f56258c1421760eb4c7044fa0e85c7e1af248