Merge "Remove explicit dependencies on core library"
am: 03c766075d

Change-Id: Ie8179fa8fc9ae9bbcb8880ac07dfe4d4aeff2297