Merge commit 'b26d493deaa9897cc6f34577aa5c9c1ff0655129' into eclair-plus-aosp * commit 'b26d493deaa9897cc6f34577aa5c9c1ff0655129': Fix issue 2459650.