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

Change-Id: I80d027ca4adffbc18b95c365d9ed27d9faaefccd