[automerger skipped] Change some formatting for better script parsing am: 55a451825c am: 0633232f33
am: 2c4332d666 -s ours
am skip reason: change_id Ibbafdcaa6e0bfa8fd2b80f4a6c9ac6ac95058f93 with SHA1 c69e3e997f is in history

Change-Id: I90494720a27f027aa0eb9923605e7a418d5d2e25