DO NOT MERGE: Split 'generating' and 'pulling' in 2 messages. am: 680f4a4888  -s ours am: 24fcc797bc  -s ours am: ad73b5c230
am: 8d1effa434  -s ours

Change-Id: I8583b3243dc2c2c9bf1132560da5466675db565e