This reverts commit 64c85ac6. Reason for revert: DF blocking Bug: 187009701 Change-Id: I04dfdf20ad5c7df3c6dddf0cc12540b179162f0b