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

Change-Id: Ie8377736618d2b2cecd9b1232cc12f06d546dc43