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

Change-Id: I09395e1536fc578de69e2bf365b6f344d41dda93