Fix some tests
am: 65bc46b3b5

Change-Id: I9b82b090a645b2c3e709cee6b5704efbaa1853ac