am 3617933b: Merge " Update to fix for bug 5393156" into ics-mr1

* commit '3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf':
  Update to fix for bug 5393156