Fix for bug 712.

Change-Id: I61f12076cc8c92d658bff749f2fc7b69ef5cb00f
Signed-off-by: sameera <sameera.k@hcl.com>
Merge "Fix for bug 712." into stable/hydrogen