Remove 'core_interface' references.
am: 1167d55e6c

Change-Id: Ia74c3130fdefc5b3403086f2f735bcb118239441