am 78c12209: 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 '78c12209':
This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch.
