Incompatibilities with other experiments has been fixed.

BUG=aomedia:1058

Change-Id: Id8358404c8f452bccf05ce3c1d91a633b215f07d