Merge "Fix all operator wrapping issues in leanback library."