Merge "Fix the calculation of the number of frames" into oc-mr1-dev
am: 4dbfc441e6

Change-Id: Ib25093ad8cea4cca2adc45eaebb4a2d1e91079e0