Let's include the NetFlix Workaround.

Change-Id: I47988366ae459c5621ac050678d38bc9b5998759