am 15e4185e: Merge "Fix b/10456377." into jb-ub-mail-ur10

* commit '15e4185ebab5d840460f6c8baf8ec77214ffb8d7':
  Fix b/10456377.