Merge "Update crash dialog icons to rounded versions" into oc-mr1-dev
am: 6201780278

Change-Id: I24adfb04cdafcaf6269ef04029bc607937b0b9ad