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

* commit '582b2fd89ca673978987d57dd969732a5295c74b':
  Fix for ByodFlowTestActivity