Fix broken tests.
am: 3983fd88c3

Change-Id: I3b9597969df0adeea04e74f2f9d729fc61c5d814