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

Change-Id: I00df0fa9dd75217c57ffe791bd39f788cc3c9d38