Snap for 5490630 from 273076448e14531f81c8159a7b95589be41f0bf4 to rvc-release

Change-Id: I062d24dc129627e48d38775d148576451afe67ee