Merge "Log errno" into oc-dev
am: 03d65ff3ef

Change-Id: I27853ae03a52dc4e044fbece1edbe449d809e7ea