Merge "Fix another source of undeterministic inlining." into mnc-dev