Merge "Fix bugprone-posix-return warnings" am: 2816b20196

Change-Id: I03a8c07336f18a9be70e1d2cbaff7465ab084b50