Snap for 5900950 from 76c7422c94c40eca6bc3b45745101a717f68bef9 to rvc-release

Change-Id: I925b5e5451c08cb5e207f9c12ac88f595a815f6c