Added Celiometer retry loop

Change-Id: Ic9740ea1de4df6ce77750adb31224bb2c4697c8d