Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be
am: 913b7564c4  -s ours

Change-Id: I9698f264d5285632c8f7f7d83726da35499f290e