DO NOT MERGE: Fix leanback Test Build am: 4795a3a496 am: 3ab448014f
am: 6ba5360f7e  -s ours

Change-Id: I1732eabae4d04153ca4c78b7b3dd26c84a7cb6b2