Merge "Fix security vulnerability am: 45b202513b am: 8778a131c2 am: 18a5e5f607 am: f91ee50667 am: b6fa70b9fb" into nyc-mr2-dev-plus-aosp