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

Change-Id: I99eb193b3a6e0d24951c887711de8b68ce39c583