Merge "[zuma] update SupportedBufferCombinations initialization."