Merge "Fix potential divide by zero." am: 8d3f61724d am: 4642158940
am: 14a8c9175b

Change-Id: I6ba0e0b3cc6edf7304cbf41fbe1bf08ed3d8c7c7