Merge of Google 1.6, 1.7, 1.8, and 1.9 releases