Adopts RAP 2.3 RC1

Change-Id: Ibf33c572611e11ee09ca2c611b07721e31a221bf