Merge "[DO NOT MERGE] Copy appop modes on write to avoid locked IO" into qt-qpr1-dev
am: 299cd3ccae

Change-Id: Ie9de464aab5eeef35118fc0711b0c15fcec0e88f