Merge commit '0f2f4d0a60cf93a7a281e217408a4249715f5748' into eclair-plus-aosp * commit '0f2f4d0a60cf93a7a281e217408a4249715f5748': Fix issue 2194140, Part 1.