[automerger skipped] Merge changes from topic "sdk_version_variant" into rvc-dev am: a4ce9b369e -s ours

am skip reason: Change-Id Ibdf18807a2ffe9bb352d74880a802ad55b57f154 with SHA-1 fca369e4e3 is in history

Change-Id: I1627ee8940e6bbee63597788aa2c0b02a1ee8d37