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

Change-Id: I1ef3a009fb96ef8b80833c3673423640904408a6