Merge remote-tracking branch 'origin/release_1.26.0'

Change-Id: Icd5e53a7ae4320088ebc0addfdae7aeff622684f