Merge "Add support to newer devices on flicker tests"