seanmfoy Merge pull request #131 from google/review-2018-07-02