Merge "Add hashcode into album id to distinguish same-named albums" into mainline-prod