Merge "Fix issue 2676107."