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

Change-Id: I787484b75a140d36c3936e69298ddcf81062dbdf