am e1d12668: am 0950a3ef: Merge "Added check to make orientation calculations more robust"

* commit 'e1d12668c1f443b1c71b5e78587353dffa5b1774':
  Added check to make orientation calculations more robust