am ee507eb5: am 89889733: Merge change I4e83a76a into eclair

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

* commit 'ee507eb560319643946d73627bc7ad3e13591f2a':
  Fix bug 2201417. Whenever the System setting that indicates