Merge "[incremental service] avoid nullptr dereferencing" into rvc-dev am: eee228f6 am: 9a9de84b am: a24835c4 Change-Id: I589c4c78987ee00dcbd031bf6efdd96a9567787d