UserMerge support

Bug: 67754
Change-Id: Ibcbbac2ca05b31afaa6322df9c1760ffb98f7a0a