Snap for 6626121 from 017bcd179d70208bb8a3fcbe115f8cfa5e64b794 to rvc-release

Change-Id: I811f0dc6d2f74d3c529f717a19fb0e672d86fc13