Merge "Add missing error checks in tests."
am: 7771604bd2

Change-Id: I39eb243582146e206391da01e849f903f8a75395