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

Change-Id: I825a0892db9b54cf0a01a498e40b1a6f41fa2782