Merge changes from topic "sdk_version_variant" into rvc-dev am: 765563bea2

Change-Id: Ic5a51600c6e19f361891ca0e89d4bb1fa821456f