Merge "Do not allow division by 0" into rvc-dev am: 517fffaa67

Change-Id: Ie1f7f637896190217e7fa05b55f81ea53a7b1dc5