Merge commit '812c1bed' into gingerbread-plus-aosp * commit '812c1bed': Provide the required out parameter to the trim routine.