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

Change-Id: Icbd3c93b4074edc773663cd906c16dd1acbd3e80