Fix broken tests. am: 3983fd88c3
am: 9cbb72e323

Change-Id: Ic18324b830875540fe3d0db2b3a3a0333a16fdce