Merge "Add attribution tags to FingerprintService" into tm-dev