am 3f4d57b1: am 582b2fd8: am efc000c4: Merge "Fix for ByodFlowTestActivity" into lollipop-mr1-cts-dev

* commit '3f4d57b167404bc260bad1b5cf873cc73fc0e53f':
  Fix for ByodFlowTestActivity