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

Change-Id: Ic90328c30bd9d4c2c020e4d1243aacc7ae4ff550