am 983994ce: am e142bf07: Merge "Fix OBB tests to stop caring about implementation" into gingerbread

* commit '983994cee594b5a9ab2c45fda5d858e94e5443fb':
  Fix OBB tests to stop caring about implementation