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

Change-Id: Id14accc8966a3fb7c2986dccbe067da8733123b0