Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev