Add UserMerge support

Bug: 72204
Change-Id: Iea125dfa0f29d34dd7e727275473a49b97627fd3
Merge "Add UserMerge support"