More expectation hacking to get things to shut up both upstream and down until I can roll WK further forward.
More expectation hacking to get things to shut up both upstream and down until I can roll WK further forward.

    BUG=none
    TBR=none
    TEST=bots stay green

git-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@59064 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser