Fixed odlSwitch and runner to put in a working flow between h1 and h2.

Change-Id: I8bba8d979a31749bad3cd1a899cc7ff9d5304ef5
Merge "Fixed odlSwitch and runner to put in a working flow between h1 and h2." into fb-test1