[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: b8d1e5ee -s ours am: e1bc1200 -s ours

am skip reason: Change-Id Id1a50ae18a2cd014093a17701f6b62070a62e5ff with SHA-1 9e20024b is in history

Change-Id: Id8026d85ad2feb6b78f1eb603732f23610e985b7