Bug: 182477087 Test: atest IncrementalServiceTest Change-Id: I98c9ed3a2e8a91d26bcb879ab7073903ff7bb2c5