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