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

Change-Id: Iedbba10d5fb01115d6eb8c8333366ae6039db0e5