Merge "Merge "Remove explicit dependencies on core library" am: 03c766075d am: 22f561340d am: 08ecb4954a"