am 9ca83e34: am 8e9a1ae5: (-s ours) am 885400fd: am 4d09db9d: Merge "perfboot.py: Add --end-tag option"

* commit '9ca83e34846eecae033d71b9069d1213cfc1f973':