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

Change-Id: I4eec960d3925bd6c30ac91f072883af8fddbd825