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

Change-Id: I7fb3e249c5ae0102d61783b6bd2e70a823297a94