Merge "Merge "TIF: Fix comments for program start/end times" into nyc-dev am: 281d96e238 am: 39f306f886" into nyc-mr1-dev-plus-aosp