CWMR fixup

Change-Id: I9c0ee2f7087b71d766c975843891cc3fbb081de4