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

Change-Id: I424ace2e996f03eb6430ad7d7a88d80e9ecfd225