Fix error code after merge upstream

Change-Id: I9c9abd307c8b19861092aff364a27a8017af91b0