Repool db1021, context RT 7916

Change-Id: I152e2a0abc93fa1de4791df1cb80ee4d2519f055