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

Change-Id: Ice072f2ed2f47b01c7d84dc6ae0a3cbb6e527478