Merge "Add Settings Aware Tutorial proto enums"