Closed scragraham closed 5 years ago
cherry pick of commit from master into release-3.6
build: https://ocd.appscale.com:8080/job/Daily%20Build/5437/
cherry pick of commit from master into release-3.6