[release-branch.go1.6] all: merge master into release-branch.go1.6

Change-Id: I392f9307c9f9012fd5cebc0013debcee6526b762