Merge "Fix bugs regarding clamping of numFrames variable." am: 615d9ff50e am: 23a9678be1
am: e9ab588c2c

Change-Id: Ieeafefed7f324a68917848e54451693d0bedd019