Merge "Move PointFormat constants into parent class." into mnc-dev