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

Change-Id: Icf63eb65d60fd04c5209c1cb40ec2134db3e2356