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

Change-Id: I50bb7f6d74299ca9a9cbe60d5de07bb95e62c39f