OTA: Code cleanup

Change-Id: I5d2f48ba3126b3f2a1f50a6696a1c819b58a1ba6
Merge "OTA: Code cleanup" into kk_mkt