Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0