Merge commit '7b4c1d52' into gingerbread-plus-aosp * commit '7b4c1d52': Pop call frame before boxing result