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

Change-Id: I29d7656b22a6990d6586a06228325a073519d7a1