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

Change-Id: Ie6488ec655be821bbb17c44796a4f49583471888