Merge "Remove explicit dependencies on "core" libraries" am: 2f1ca58622 am: 0a6780c581
am: 452cb831fb

Change-Id: I79adcd869f11cf9e9f9b0c6614b11ae1297b87e5