Snap for 5817336 from c72482b84e018e98dc2d5e668e019d2a5a509d4c to rvc-release

Change-Id: I9223e38a6470b6e4c58823ebeb874f60cf3749fb