Merge "LocalSettingsGenerator: Remove unused commented-out code"