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