Getting  ready for OTA

Change-Id: Ia1f33cabc3ee9e030ddcf685b1c707284c486d6a