more cwr5 work.

Change-Id: I72bb14ef25a9067ccde3e40ea989c7990512687a
8 files changed