Merge "Use proper start op overload in all places" into pi-dev
am: 0b7bdb0cc1

Change-Id: Ief60b4bcae1ecf6385428cb5e56b112e1fcffd60