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

Change-Id: Ie1277fe6236d0f5218edad06a0ed24ec2a3084de