Merge "Avoid overflow in focus fudge calculation"
am: 795d4a5aa4

Change-Id: Id15034f5a02f93a4fe8487b5516993a9bf6f4ada