Fix 'rdcd diag' compute and system tests.
This reverts commit 61a2773875.
Change-Id: Ia092c46649c1d6338fb96ffe7e6feba4b045f027
Fix 'rdcd diag' compute and system tests.
This reverts commit 61a2773875.
Change-Id: Ia092c46649c1d6338fb96ffe7e6feba4b045f027