return_status::checkStatus => assertOk am: af4e43cc5b
am: d367c32a86

Change-Id: I408ac421909cde4593f5e59bddfefc2d5d185508