[automerger skipped] Merge "[DO NOT MERGE] Crash the process when midi...

[automerger skipped] Merge "[DO NOT MERGE] Crash the process when midi extraction times out" into qt-qpr1-dev am: 6c6ea89e -s ours am: ba8fee2a -s ours am: d2e05fd3 -s ours am: b1b41571 -s ours am: 4332c467 -s ours am: aa61923a -s ours

am skip reason: subject contains skip directive

Change-Id: I5d47aa40e19aeecaa9360e6fe288c331fa210d30