Adopts RAP 2.3

Change-Id: I78e97b1077c50b9bb159bd537749e27fa6de7919