Merge changes from square/master into google/master