Merge "incremental_server: fix a use of uninitalized memory" am: 0ea130eab1

Change-Id: I9ec36fbf1074413cedf222773b0a81fbfde7acf7