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

Change-Id: I47258ce06c86cdce5674beae4433b3f4288fbb8c