am d252a725: am 58e7f5ba: Fix for bug3389029.

* commit 'd252a7256ec964116aeb569fad6a6057aba82165':
  Fix for bug3389029.