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

Change-Id: I204d30c7852a6ee6909d5eee36d043023c6de735