Merge Ooyala fixes.

Please merge these Ooyala fixes.