[automerger skipped] Merge "dataloader/incfs openWrite returns int" into rvc-dev am: 1f9875dc17 am: 32290926b8 -s ours am: 60aceddac2 -s ours am: 2628cacf6b -s ours
am skip reason: Change-Id Ib3a1c7c45a4abaab793be73213545ce91c98510b with SHA-1 b8ab0034c6 is in history

Change-Id: I39f9296f8fcfff6a693d9230d550910803c10337