Merge pull request #1397 from jason-simmons/editable_text_unused_import_sky

Fix a couple of analyzer warnings