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

Change-Id: I5e0fd859c4850f1775bde423e56411ca1479717f