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