DO NOT MERGE: Fix leanback Test Build am: 4795a3a496
am: 3ab448014f

Change-Id: I0a91de389cdf7d81e56009221ef94a8851cf086c