[automerger skipped] Merge "Do not allow division by 0" into qt-qpr1-dev am: a4768b7b1a -s ours am: c1fe7d6138 -s ours am: 484368623d -s ours

am skip reason: Change-Id Id1a50ae18a2cd014093a17701f6b62070a62e5ff with SHA-1 96aaa02edb is in history

Change-Id: I90b4b8ec50d75cf5436ff8ebc1379928a32ac71e