Merge "Support multiple requiredSystemProperty in overlay" into rvc-dev