DO NOT MERGE Decoder: Increased memory allocation. am: ed7a63fbcc  -s ours am: 848428bb84 am: a838b2f7f8 am: 3a8511dfaa  -s ours am: 6d33435d4f am: 85615c3618 am: 586344f327 am: 6be35a62b0 am: 70defc46d2  -s ours am: cbab4f6e43
am: 553a478695

Change-Id: I85eb67eefc9fac4e5e762e7b06ae42c890e055ab