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

Change-Id: I73e8665b3f81841d139669221a8b6b73362a8934