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

* commit '6f24e2ef8134b270d1beb236c2e6a5bbb902d379':

Change-Id: Iaede0821d8433e98e4244a75a656702d2d8da3c0