STAinfo code changes

Change-Id: I51d5faeda1e1aecd17d1b3ac6bae40a694858585
Signed-off-by: Andrey Shamis <lolnik@gmail.com>