DO NOT MERGE: Revert "Revert "Fix for ByodFlowTestActivity""

This reverts commit 38a7ec8cc562c5b9077b12ab4c9059096d47d357.

Change-Id: I34e5bb8e134e1199dd3af8ae39f6925a886f5134
2 files changed