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

Change-Id: Ia3f9c9164eb34aabd6aa7dca609a2872e872d511