Merge changes from topic "ctor-refs" am: 1ac3746aa8

Change-Id: I974af9e767cb3683a4b5afedf4e30d2f33c88477