am fd460a1f: am 097fc64d: Merge "Don\'t signal an error at the end of a short...
am fd460a1f: am 097fc64d: Merge "Don\'t signal an error at the end of a short file" into lmp-mr1-dev
* commit 'fd460a1f':
Don't signal an error at the end of a short file