Add support for incremental updates

Change-Id: I867f5b98851694ecb620d2ce026d224040166fa7