resolve-issue

Change-Id: I516c771ee1b99d1104d66848caf4099b646490be