Merge commit 'e8edf08f' into gingerbread-plus-aosp * commit 'e8edf08f': Perform only one garbage collection before attempting a trim.