Merge "Fix issue 3388354."