Merge "Limit too large shift exponent in apply_inter_tes()" am: f828d3e16a
am: 2027969e1f

Change-Id: I1c13d0a0fbbeb5c937e3e1391f0974e5caf76a20