Merge "Delete tests associated with core-simple code" am: 97c45ae119 am: 1f73e6000f
am: eb9f0f7182

Change-Id: I8129312d6f6e93af6b966ef0b9beea0b80e7a22c