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

Change-Id: I1638805e52a006b781d325ce286c7b894b4f048c