Merge "Update platformDir search in tests." into mnc-dev