Merge "Merge tag 'v1.6.34' into HEAD" am: 9ef33ccf9b am: d22b720111
am: 2c58cd950f

Change-Id: I2a04f2d47e3fd1950e08b74a5771351b73be9d35