Adopts latest RAP changes in Test Fixtue

Change-Id: Icdabc1bba39fe775f297e648145e2c38d4628cef
Merge "Adopts latest RAP changes in Test Fixtue"