am b0e65b8b: am cefcf8e1: am 30c51aa1: am f8b940fe: am b553f3c2: am ec90764f: am 1b331600: am bc84bc01: am 199a3b58: Merge "Revert "Fix for ByodFlowTestActivity"" into lollipop-mr1-cts-dev

* commit 'b0e65b8b6f85d7a0abb2ff2f4c4187f61f16c47b':
  Revert "Fix for ByodFlowTestActivity"