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