Merge "Fix for testListen" into lollipop-cts-dev