Fix broken tests. am: 3983fd88c3 am: 9cbb72e323 am: 5365c1d1ef
am: a85bb87f0c

Change-Id: Ifd435296707ec3155bfc996d718debfb4656f7e0