am 50cf95fc: am 87c6f9a5: Merge "This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch." into jb-mr1-dev

* commit '50cf95fc7d5481d7f1d9a2c6bb7496a77ad9e926':
  This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch.