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

Change-Id: I44a7218de67cc35d53711ac6dbdb296e1dd59b96