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

Change-Id: I6cb61d679ec3eb4f03a72f89df71cb6575586a2d