Merge "Fix security vulnerability am: 45b20251 am: 8778a131 am: 18a5e5f6 am: f91ee506 am: b6fa70b9" into nyc-mr2-dev-plus-aosp