Merge "Support importing property file with expanded name"
am: 69880e1a39

Change-Id: Ic2453514c72ddd88269cef659df42642997427c9