Fix broken tests
am: 25c842532e

Change-Id: I82a55423e2cdee1f55fd3e20ff935ca4967df3b3