[automerger skipped] Merge changes from topic "cherrypick-ctor-refs-03y8i58ine" into rvc-dev am: 975ca816 am: 3b0ca2b3 -s ours
am skip reason: Change-Id Ib2e4360493275b79c72487ee1cb173bb5e0fd35f with SHA-1 88d565e7 is in history
Change-Id: I871bf622dec294f07dcfe5330bb41acda65f50cb