[testfix][release-critical=lifeless][rs=lifeless][ui=none] Revert the
        merge of the check-in-WADL branch,
        which was causing the build to break.