Merge "Add FLAG_INCREMENTAL support to LocalTransport." into pi-dev