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

Change-Id: I59419d8087ca0d2f13685bf86e3c122ae61dc0ab