BUG: 187354818 Test: atest service.incremental_test Change-Id: I632b747440ed4faef31266a3a7b18b7a382ff2cf