Merge "Fix bugprone-copy-constructor-init warnings" am: 4dc2f8f773 am: 87158910b0

Change-Id: I6845ad403b8b7c4572053fc49998ed5e7c01c6be