Fix broken tests am: 25c842532e
am: 35b558b031

Change-Id: I16941d175d53deca96bd7f854fc8dfc1b005f8ed