Remove incomplete Merger code from master so it does not block release

Change-Id: I71521e04f583514a911d13f9c2ddd8eb68320ba4