Merge branch 'master' into maintenance

some cleanup, running samples instead of screenshots in earlier targets, adding links to cookbook

BUG=

Review URL: https://chromiumcodereview.appspot.com/13890020