Apply patch.
Merge branch 'patch-ordering' into blob-reorg
Merge branch 'blob-reorg' into h264-blob