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

Change-Id: If6da6c27ebbfaec746ef28df6721a6cd0abe3b80