Merge "Split 'generating' and 'pulling' in 2 messages." into nyc-mr1-dev
am: 4e63312ac8

Change-Id: Iffbc0015406b6c18bc8263c8ea75899c0d391e26