Merge "IMS Bug Fixes" into nyc-mr1-dev am: 351248cef2
am: 22a8a9c98f

* commit '22a8a9c98f6df6e2cb2d2f21d7103a838285d95e':
  IMS Bug Fixes

Change-Id: I8432250d6969a36374bc807768c30abe78f2db6a