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

Change-Id: Ie1256b68bbf185b640791aac7cb3e5ea63dc1857