Merge "Remove unnecessary assignment for mNumberOfFramesToHold The base class switch to use 1 already for mNumberOfFramesToHold"