These came out of a larger refactoring in I601ea1200a. Change-Id: Ib3921d414bd26de5360b72ff709dd751382e8f18