Added OC/UC/UV support and few other changes and edits

Change-Id: I4aec69355203c6b01a1c9a44a051bcae603f19b0