[automerger skipped] Merge changes from topic "sdk_version_variant" into...
[automerger skipped] Merge changes from topic "sdk_version_variant" into rvc-dev am: 765563be -s ours am: a9f020bd -s ours
am skip reason: Change-Id I02bcbc0cbfef6ef66a79ad2ccd73c8af101b67de with SHA-1 198edb4c is in history
Change-Id: I352c5b18a88fdf4eb8798d13f62f96f6095c343c