Merge "Add zhfan as owner of settings_enums.proto." am: a313cab4dc am: d4b35c7924
am: 3e8e89dd96

Change-Id: I8f00cf972970722342c16c45213df0cc9dc6d6ef