Merge commit '78128d721cdff2e035eab5da72819520f88affaf' into eclair-plus-aosp * commit '78128d721cdff2e035eab5da72819520f88affaf': Fix regression.
Merge commit '78128d721cdff2e035eab5da72819520f88affaf' into eclair-plus-aosp * commit '78128d721cdff2e035eab5da72819520f88affaf': Fix regression.