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

Change-Id: I2efba9bffd8a680c29dbbe192861a960faac4e55