This change also renames Key.keyLabelOption to keyLabelFlags. Change-Id: Iedd0bfaa420ad382c07ce084416355690e390919