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

Change-Id: Ie470ed94ea681363963987bbd137efb39d62bc1a