Sync with local-commits on tavern.git

Review URL: https://codereview.appspot.com/66500043