DO NOT MERGE: Removed extra 'pulling file' message.
am: daf4628f36  -s ours

Change-Id: Idef6f24c1e590f1ffb3ccdfd2cd8679f3976dadc