Merge "Update Guava 15.0 -> 17.0" into studio-1.0-dev