Merge "Fix test failure on testPathMorping on API 23" into nyc-support-25.4-dev