Merge "Fix b/10456377." into jb-ub-mail-ur10