Merge "Set CdbTest to skipped instead of incomplete"