Snap for 5600116 from 6e2bb32e2cf81324b6a484587ba838a1e42f8770 to rvc-release

Change-Id: I14a702f5c235e17d3ac3ac38df2e019ddf4a833d