Resolution - Part 1

Change-Id: I2f3a385fef75e8aa227c619f721934a67b5b347f
Signed-off-by: Manoj Palat <manpalat@in.ibm.com>