Merge "Build with core_current" am: 56dce0b1b7
am: 445e7fa3de

Change-Id: I9d3e3283ea61926bfaf9b6bcf48c5999386c5492