Merge "Update to 1.6.34" am: 2b58cadf4b
am: 209c502a3a

Change-Id: I5cddec8d4199888f0a1deb1edb578a92dbc942e2