Fix for Bug 957

Change-Id: Ifea346315b62b36d3c9c8bf2a180c7db157f4b79

Signed-off-by: Ravikumar Chiguruvada <ravikumar.chiguruvada@ericsson.com>