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

Change-Id: Iada329b14b66825933f6b42b9eb259584276b9cd