Merge commit 'a184d4b9' into eclair-mr2-plus-aosp * commit 'a184d4b9': Clean up codes and remove/modify stale codes/comments.