Merge "Merge "Fix security vulneratibly 31960359" into nyc-dev am: fefc4f4e94 am: afee0c9de4 am: 68fcdf6a93 am: f09debed94 am: 0932701ea0" into nyc-mr2-dev-plus-aosp