Merge "Update OMX messages for 64 bit"