Merge "Set file capabilities after writing file data" am: dd4e5ae943 am: c6fbcd7579 am: ded50a76f6
am: 8fd0ce9bc9

Change-Id: I9d76ef0bbdaeaf615ace173e92cda64f6dcd6e5e