am 944d624f: (-s ours) am 35013d0e: Merge "DO NOT MERGE: Remove a few...
am 944d624f: (-s ours) am 35013d0e: Merge "DO NOT MERGE: Remove a few left-over layout direction things." into jb-dev
* commit '944d624f':
DO NOT MERGE: Remove a few left-over layout direction things.