Merge "Fix errno handling to avoid being overwritten"
am: bc0c48496c

Change-Id: Iad518c4ef32fe460985c23015493cb66c59fcabd