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

Change-Id: I2880bdc9157996d30472e3eddb714c498b14e66b