am 58e7f5ba: Fix for bug3389029.

* commit '58e7f5ba2b25464eee6cbcbfc885a3a9137fb849':
  Fix for bug3389029.