Bug: 198532074 Test: boot with app correctly labeled Change-Id: Iba1f5c949052fafca8e629aba24484a7705f3f21