Fix default for remove_labels setting

Test: manual
Fixes: 175763525
Change-Id: I837232af7eb47390c69789a7c70be51e2849fee3
(cherry picked from commit 7222fdcb0eae4a9b19ed03e71fca3eedc7c0bb4d)
2 files changed