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

Change-Id: I13c99cf1144b8b3e597eccf0904b0190f119f38b