Merge "Remove explicit dependencies on "core" libraries" am: 18f9a2c24d
am: d252f61f66

Change-Id: Ia66748d28ecb846d190b9dacb004a734c11bc54c