am 737592f5: am 3bf72818: Temporary Work around bug 8170660

* commit '737592f5fbf079487a0f21b04d302c8cd39dbee0':
  Temporary Work around bug 8170660