S000: Adding cistern

Change-Id: I5c27069e3d647e5b9062ccc000d5d4c03f146303