Snap for 5523005 from a86fc915806891095e377b739b13fca18a87d591 to rvc-release

Change-Id: Idcbf767e41ddc60fe215f3051ecd7181e9f49bd1