Merge "Better mock out CEC NativeWrapper"