Merge "Fix issue 3388775."