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

Change-Id: Id69c2786538319906619351f14d8cbe27d6899a1