Revert "Updates encoding/decoding of optional metadata"

This reverts commit 42a88242c83a6e46357b3d3b3ea90da3f7a66381.

Reason for revert: breaks api freeze b/232072943

Change-Id: Iaa4cf4c0e991fab03dbb9c7665afb92a052f4210
1 file changed