Snap for 6779986 from 1756cb6d8f89ba4f79e37708510164bc1a449177 to rvc-d1-b-release

Change-Id: I638817afcf2b9529e3c69495d53b5c462eb28047