[automerger skipped] Merge changes from topic "sdk_version_variant" into rvc-dev am: 765563bea2 -s ours
am skip reason: Change-Id I02bcbc0cbfef6ef66a79ad2ccd73c8af101b67de with SHA-1 198edb4c97 is in history
Change-Id: Ifbdbdbb226ff86349ea3e63f14fd9e39e391d511
This commit is contained in: