Merge tag 'v1.6.34' into HEAD

This is a dummy change just to merge the git histories. There's no change to any file.

After this I'll send change to merge v1.6.37.

Bug: 134761359
Change-Id: If4203e6271b2728467ae93afd84bb56bdc6615fa