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

Change-Id: I093adf71584cc8cd0d335bae174b70e31c7fd6cd