Snap for 6360434 from e9cae24a46bdf998e7a1f496573e38f104dd4e74 to rvc-d1-release

Change-Id: I8aa02c34904863e9b57fe60b4d047df327640af6