Fix2 for Bug 465654 Change-Id: I95415c5ca798f3baf803cf542b9e7454fe4d4071 Signed-off-by: Sounak Basu <sounak.basu@sap.com>