Merge "Fix reference leak on TvInputHardwareManager" am: 8b578c9c92 am: c91d1ea7ed am: ec955bbf91
am: e823655a9d

Change-Id: If72c520c079eaf5134beb1054caa12e0bc93172f