Merge "Remove explicit dependencies on "core" libraries" am: 891895aece am: aab7f77703
am: d4e9493e63

Change-Id: I522aea02cb6faa2ffb01e484d9ec49fb6dfcb4f2