Merge "DO NOT MERGE Fix divide by zero" into klp-dev
am: 2c28e5b126

Change-Id: Ic69824aeaf760eb6b5e79fef78be41c2cb4d749e