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

Change-Id: I11251f791d489faf3dcc5356903e1fafac40e345