Adopts RAP 2.0 RC1
Fixes Build.

Change-Id: Ide0615307b305c3bc20c898dc25e032146dc5485