Merge "ConcurrentModificationException: Add test coverage for message, cause."