Merge "Add test for importing a single type." am: a543fe6ab0
am: ccdc46999a

Change-Id: I249ed97a6c000d655d1273b59a69b5cf4f1d4567