Merge \"Limit the number of blocks in command zero\" into nyc-dev
am: 0eade3f027

Change-Id: I56afbc6fed2d79d2ab71a35577739c96d779de6e