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

am skip reason: Change-Id I7d72934aaee2e1326cc0ba5f29f51f14feec4521 with SHA-1 82e192c3ae is in history

Change-Id: I8c7ba0b2ae10af577f08eb2f18a7c92a6227c277