[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 am: cf26c78b am: 0bb1c645 -s ours
am skip reason: Change-Id I02bcbc0cbfef6ef66a79ad2ccd73c8af101b67de with SHA-1 4a1fd46b is in history
Change-Id: I5d1368caf395a61d5378b8225480430af00821ee