Merge "TIF: fix 'divide by zero' exception in BundledTvInputServiceTest" into marshmallow-cts-dev