Merge "Include changes for RTL decoding in Asset"