Merge "Fix test failures(bug 268231685) on TV targets" into udc-dev