am 4317b341: am 24d966a3: Merge "Fix math errors causing black screen. DO NOT...
am 4317b341: am 24d966a3: Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev
* commit '4317b341':
Fix math errors causing black screen. DO NOT MERGE