[automerger skipped] Merge "Support importing property file with expanded name" into qt-dev
am: fa94b8f96b -s ours
am skip reason: change_id If3fdcf620a5d717e0930b1e4e58261bc8f79ec24 with SHA1 a87c0f99ad is in history

Change-Id: I2fef32ad141aa382409dda5111cf23dc8c5ec321