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

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