This reverts commit 7022550d. Reason for revert: Breaks app's DRM Bug: 317744117 Change-Id: I539e6ec037db1c297fe7cf85d294bebe963ab214