[automerger skipped] Merge changes from topic "crashparser-oc" into oc-dev am: 6c72edd1a4 am: 493fce30fd -s ours am: 8174b30ed4 -s ours

am skip reason: Change-Id I6a351c376af5b127164a31a27579b65969920ec2 with SHA-1 a9f5ea3df1 is in history

Change-Id: Ifca26e5cb456ecfcb4587262028eef5c93d2f9c5