Some changes in STA

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