Fix broken unit tests
am: 8c13d104c2

Change-Id: I481aec5932d8bc7d9a61a50208adcc1b0803d787