Merge "ErrnoException: Add test coverage." am: e039e335b1
am: 3e575ee16b

Change-Id: I855cf28a881cbabed3ac2b0051297ee7a904a0c9