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

Change-Id: I7061ea9cd583c28f0467a497df4c777e880bcc0a