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