Revert "Fix for ByodFlowTestActivity"

This reverts commit b890e69858f84b1065a22df43aae2469d3e0f13e.

broke M build

Change-Id: I53ca0f6824710f60db7a0d48b627f98774dd4dae
2 files changed