Merge "Leanback tests: Fixed two test failures due to API changes"