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

Change-Id: Ia3b89d23a932ae4d571920291e28d1a6b7592784