am cbfa0fef: am 10c6666e: Merge "Speculative fix for b/8782526." into jb-ub-mail-ur9

* commit 'cbfa0feffa0548d4213370573a2d13a104f4890e':
  Speculative fix for b/8782526.