Modified OTA added Thanks

Change-Id: I2cbd9bf78c3a7a510fe65150df11c3f926349b3f
Merge branch into Zips-jb42