am 157fb9e5: Merge "Change RETURN_VOID_BARRIER to RETURN_VOID_NO_BARRIER"

* commit '157fb9e52b8f11daeec5fbd6286853e0b920c215':
  Change RETURN_VOID_BARRIER to RETURN_VOID_NO_BARRIER