Merge "Revert "Updates encoding/decoding of optional metadata""