Merge "Build with core_current" am: 9b65b98ff5 am: 252be30b42
am: cf9472443d

Change-Id: I12ec6bdb2005d3e7fed26029b1d412d23f76439a