[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: 48436862 -s ours am: 35ece52f -s ours am: 2202b0b5 -s ours

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

Change-Id: Ie0d31d957c19b0ea4c0f805a8cba38a736e6209e