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

Change-Id: I04a8255aed739fd10c1f1512f2c0ca4723109dc9