Fix a broken scaffold test.

Related to bug 1311629

Change-Id: Ic442457c501d598814f492e7aab4d885bdcf0711
Merge "Fix a broken scaffold test."