Adding new format strings for OCG

Change-Id: I26a8ee3ded2a5fa2f57c59b7ee0a0d857c48ffad
Merge "Adding new format strings for OCG"