Merge "EncoderProfileLevelTest: Updates to the fail criteria"