Merge commit '7500eded35ce173525d7fc1e8172679188d3b33a' into eclair-plus-aosp * commit '7500eded35ce173525d7fc1e8172679188d3b33a': Fix issues 2333450 and 2333559: