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

Change-Id: I4d94ded20c8d24f4ffac67a89862c6f477fa1342