Minor refactor to clean up Diff module for rt-server

Change-Id: Ic7afd9071a91d38f9002ab83a28140cea6a106c7
Merge "Minor refactor to clean up Diff module for rt-server"