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

Change-Id: I7eed1c242283ef08caf023302f2d8d9e6254afa0