Merge "Fix multi source folder API checking" into mnc-ub-dev