GitLab

There were just too much shared code between the classes - we
cannot have them in 2 different process - it can work sometimes and
will fail sometimes depending on the ordering of processes.
Rework involves a lot of code change at this point of time.

Bug: 2684281
Change-Id: I76784650c5f635c1e961392b682c1d33fc2f343f