Merge "Make inlining deterministic." into mnc-dev