Merge "Fix security vulneratibly 31960359" into nyc-dev am: fefc4f4e94
am: afee0c9de4

Change-Id: I8378cc46c5d1caaa3b018c45929b6767cefa3bb9