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

Change-Id: I4c4c41d094ddf8945d955ef346b49bcb01d3214d