Feature neutral code cleanup

In preparation for fixing b/7185158: Change Labels list has built in
labels listed las

Change-Id: I17bea019c5406ac7e97f54e13295bda968814569
4 files changed