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

Change-Id: I91ed7788f99ef1d0a20cc794675b1087407a9511