This will allow for aligned cdfs and scan orders inside.

Change-Id: I799af6cc0b87d90bad56f32fd822e0690fc51b8b