Merge "Remove LocationAttributionHelper and minor cleanups"