Merge "Fix _ImportParser() error if property is imported from oem partition."