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

Change-Id: I9b93f19ef77dad9b9138cfe74d6d6cc9845aa7f5