am 63446167: (-s ours) am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2

* commit '63446167b9d6d9ed3410320d17e8fe816caf6c42':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.