[automerger skipped] improve handling at end of buffer am: 5d2e0a05b7
am: 53c13b251e -s ours
am skip reason: change_id Ifb790a7d1d09a4ce7da900b43e3fa1f7ab01ac53 with SHA1 aae866aed5 is in history

Change-Id: Ic508f1b8ebcd7c70c6f6e1df6e3e01ee6bd33c4a