Merge "Fixed a path issue in NoLocalSettings"