[automerger skipped] Merge "[DO NOT MERGE] Copy appop modes on write to avoid locked IO" into qt-qpr1-dev am: 299cd3ccae
am: 13cfe928a3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia927a95b7e5e7f9397bbeee2f624cb66d5e35605