Track addition of core-simple am: d5d5894f91
am: 3782cc43d7

Change-Id: I9a9b9814377d3e5cf4c8daccc290150cf1ed70dc