Merge changes from topic "ctor-refs" am: dc123f2a39

Change-Id: I4be3873104ca866144b02585e125e8338670875b