Bug: 180535478 Test: IncrementalService unit tests Change-Id: I663dcdce337c289cacc5dc7224dedf5a55605c86