am a184d4b9: Merge change I11526e6c into eclair-mr2

Merge commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5' into eclair-mr2-plus-aosp

* commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5':
  Clean up codes and remove/modify stale codes/comments.