am ba716af3: Merge "Hack fix for b/10709572." into jb-ub-mail-ur10

* commit 'ba716af3e291308fe633a21115fcd615ccd1a0a2':
  Hack fix for b/10709572.