Merge changes from topic "core_current" am: 306cee108f am: c9d526ea12
am: 1fc58ef03d

Change-Id: I27529911a69ebb4517e613c95988cfad7d97a18a