Change-Id: Ic8eafba071e486e671257bc22a8208e86d68b08a
We broke the Chromecast build with our recent Roku changes. Cherry-picked from upstream. Change-Id: I7838d10b2ad0ef8b93d8b8510e96e7d4cfa2596a
Change-Id: I1db8582efba613fa8a2b91a9c2697c5dfb2a8abf