am c0023fec: am 84bfbe14: Merge "Fix broken tests."

* commit 'c0023fec9f5eed1cf926ca44d53cacbc8218319d':
  Fix broken tests.