[Bug #1371660 ]

Change-Id: I96fc3d15e1b81adaf6762a58f6701ba36e7d5a94