Merge "trunk: Skip trunk tests because of bug 1740885"