Merge "Do not use hardcoded frame rate 15 fps in cts test" into ics-mr1