[automerger skipped] Merge changes from topic "ctor-refs" am: 1ac3746aa8 am: d14004d53b -s ours am: 8724137da5 -s ours
am skip reason: Change-Id Ib2e4360493275b79c72487ee1cb173bb5e0fd35f with SHA-1 88d565e7e7 is in history
Change-Id: I0828bc4d4ae738f43cf9726a16913c22a01a5df2
This commit is contained in: