return_status::checkStatus => assertOk
am: af4e43cc5b

Change-Id: I0ff53ddaaa84d62cd95f119791b8fc02734e69ed