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

Change-Id: Iddee3558abb08db342602fd9410fc8e0a2854081