returning db1005, adding db1058 to s5

Change-Id: If7a9686dc11c38341c8f16af610c550bda511b5e