am 874641f1: am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0

* commit '874641f1331f3b37e8b2d930ed942fb6ca522501':