Merge "Build with core_current" am: 0f9b9a667f
am: d77b941f94

Change-Id: Ia1774739d5e1371fd131acd1ad4c6d4314acb1d5