Don't branch OggHandler

Change-Id: I2b4fc4d182076ecf10a666e876df16d054c0839f
Merge "Don't branch OggHandler"