Move supervisor autocomplete into function
Move supervisor autocomplete into function

Change-Id: Iebcd27893f1801084ab8b39753b9c779bab16ead

Opensoftware/USI-Core,Opensoftware/USI-Core,Opensoftware/USI-Core