Merge "[incremental service] avoid nullptr dereferencing" into rvc-dev am: eee228f65e am: 9a9de84bba am: a24835c443

Change-Id: I589c4c78987ee00dcbd031bf6efdd96a9567787d