Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4  -s ours am: 391b2806b5  -s ours am: 172fa07944 am: 8f8e719106  -s ours am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b am: 5a4695b5cb  -s ours am: 45a89389ac am: 953b6b19eb am: 00082e26da am: 63425d5b7b
am: 93dcd27e22  -s ours

Change-Id: I675291e745e874b7edd0285af578697526167edb