Merge "Fix bugprone-posix-return warnings" am: 2816b20196 am: 5a8fd4c4c1 am: 46760802b4

Change-Id: If190947c256c50e2e1e507993bbf0d614e6d5d51