Snap for 5704056 from 84f4a8077845ba374716c41e83ad5df485953493 to rvc-release

Change-Id: If34bfad5514ff98302195f4717732d288a933165