am 29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread

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