Adopts RAP 2.3 RC2

Change-Id: Iffc86619bb24fc264460c2daa6925b3beb7ff75a