Merge commit '4113e27085a80447d332415b0bd30a0f2ab68378' into rvc-d1-dev

Change-Id: Ie07e1d3d18928cc2cd40a535b0ce7729ec2a239d