Merge "DO NOT MERGE Added check to make orientation calculations more robust" into honeycomb