Merge "Speed up SimpleDecodingSource"