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

Change-Id: I0509b4debdf634075df7d8f63516d0b8e18e4b8c