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

Change-Id: I2981fe6d00fcc270a31f5baed59d42e0a9eccedf