Snap for 5984067 from 8a460b7b6ce4779d34f8a63c201f4ac56d3a0752 to rvc-release

Change-Id: I8edacadda0eae63b87feb7cbe3138b79717d9e87