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

Change-Id: I6b65a8e5e9ef45e5549d757f09b9ddd93641d2e7