Merge "file system test: fix additional write in file creation" into oc-dev am: f17484ed6b
am: 43851f932c

Change-Id: I6bcbb8a093ab67211b94320376fae5b7994fa851