Snap for 5575726 from 179ca1ef2bf899277a61877f89a22ea086a66ffa to rvc-release

Change-Id: I50dbefc61e031f2262b52b16241fcadbd5450d41