Merge "Move rild to the core class." into honeycomb