Snap for 6664334 from 7f1f8030db5074c5b023533cb030a5d1bbd10c2c to rvc-release

Change-Id: I4449d0c25c6ffb84191f4d9fdaeba19dfac647a1