Merge "Remove explicit dependencies on "core" libraries"
am: e328f9b23e

Change-Id: I0d8fb0103f5eefbf8872d3e8df1a13e249885243