[automerger skipped] Add basic progress reporting am: 8f499dbdaf -s ours am: 9d8595f07b -s ours am: 2bbdfeeb5c -s ours am: 09367b1a93 -s ours
am: cf717ecbeb -s ours
am skip reason: change_id I430ecb8aa3e57ef9f1ffda3a45fac29b312fc9da with SHA1 085200181f is in history

Change-Id: I4f17f297f20820b4b99e58f129c31a5e65a534b9