Merge "incremental_server: fix a use of uninitalized memory" am: 68301aca72 am: 0dd0ec6600

Change-Id: Ice072f2ed2f47b01c7d84dc6ae0a3cbb6e527478