Merge "Get rid of dependency on core from linux build (2/2)" am: 77a4c05a7e
am: 3ed4100144

Change-Id: I6b973ba10be50f238ff55df664ddb24f0e2d10eb