Merge changes from topic "b116618418"

* changes:
  Status: no 'okay' EX_TRANSACTION_FAILED
  Revert "Status writeToParcel no OK on ERR"