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

Change-Id: I1d83f4fed6d21a2777ed65b681645d694bd673af