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

Change-Id: Iefb655051572031ab669ef534f32ec91e180f319