[automerger skipped] Merge "Do not allow division by 0" into qt-qpr1-dev am:...

[automerger skipped] Merge "Do not allow division by 0" into qt-qpr1-dev am: a4768b7b -s ours am: c1fe7d61 -s ours am: 517fbbeb -s ours am: 78fc1033 -s ours am: 04c97b6d -s ours am: 3de0757a -s ours

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

Change-Id: Ibd4f6ada7b200a09e2cfc79fa3cac764e2f51c56