Merge "Add tmfang as a owner of settings_enums.proto" am: ca33485de9
am: c375505b8b

Change-Id: Ibca5db46aef6c2faa66e2aff325861e64192c6bc