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

Change-Id: If3263da8fe0f9b9c37604df567f355016508ebc7