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