Merge "Update to 1.6.34"
am: 2b58cadf4b

Change-Id: I1c64b33803ffd5fda12b83604e9f59d90ed9f5f8