Merge "Fix bugs regarding clamping of numFrames variable." am: f4935e88d1 am: 716f64f54c
am: e0aad0c927

Change-Id: Icc90f9b1e561d4b3db61730509d65b0a8b0cc0f2