[Bugfix][API-584]reduce ubi problem

Change-Id: I347900292290a5f515ba02971364891bc15a36fc
4 files changed