Fix fluidity in builders

Change-Id: I087f6553d08f29ba868f401fc7798e6f4503ae7c
Merge "Fix fluidity in builders"