Merge "continue read file when returned count > 0"
am: 894c578a02

Change-Id: I43f5be6a4b365e2e7ea11ae413860d9cb0c37949