Snap for 6890386 from cf5de99a83d4e8bd061338c2dd190b98df639e8c to rvc-d2-release

Change-Id: I804039bbdb66bfadf4707df92831f886c8f11532