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