Merge "Fix srcCompat set ordering issue" into nyc-dev