Merge "continue read file when returned count > 0" am: 894c578a02 am: 2a82e9a69c
am: 289ccbd48d

Change-Id: I8921e6be0760cdedef05c74ae1e77e18b9bd2b04