Merge "Quick fix layout test path problems"