Merge "Specify the duration time base am: 6f672a3835 am: 7922ef60fc" into qt-r1-dev-plus-aosp