Order id blah blah whatever, squishme when you're done.

Addressing awight's first review email

Change-Id: I1c34ff7e57ed79353837356adbc1fa8ae0efce37