Merge \"Fix for ByodFlowTestActivity\" into lollipop-mr1-cts-dev
am: c3c02243b0

Change-Id: Ibb909756e8e8ace7da8541efccdb39125c541232