am ff8b191f: am a29f645f: am 2ab90d36: Merge "Fix for failing test of testEOS because checksum takes too long" * commit 'ff8b191f': Fix for failing test of testEOS because checksum takes too long