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

Change-Id: I8da8b15efed6263ca8afd5acbda500a8fc9c12a6