Snap for 6660508 from 8f490e21c928c6b298f0a374d24494906396462e to rvc-release

Change-Id: Iee50204689bce857e0420d8b2e444ebe9738b328