Merge "Upsize the buffer of the raw decoder" am: c48a1bc70c
am: 9a515a7e64

Change-Id: If5c1568f12afb475b66da1bce161cad9f65e22c2