Change-Id: I2eaf564b35624c8441cb8f54f6ab166f5d1762a2
Applied the patch given in bug report Change-Id: I01ded82bd426edf630561b013d7cafe46130d697