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

Change-Id: I0c832af83237e72163be868551a5bcfbaf81e276