Merge "Make room for AVB hashtree and metadata."