Merge "Fix Dimension Calculations" into honeycomb-mr2