Make Serializers more stand alone

Change-Id: I017786d34ec6d1b0a1c276fcd3517c3c50b08686
Merge "Make Serializers more stand alone"