Merge "DO NOT MERGE Fix divide by zero" into mnc-dev
am: ec206acb99

Change-Id: Id2100166f21c42cacdfb26c82fe32a07c95caa82