Merge "Support importing property file with expanded name" into qt-dev
am: fa94b8f96b

Change-Id: Iff4adad019e0f919536d1cce0ed55d536ea65e4e