Merge "Some updates for Speed 6/VAR_BASED_PARTITION."