[Bugfix][API-584]reduce ubi problem

Change-Id: I347900292290a5f515ba02971364891bc15a36fc
(cherry picked from commit 20300d251babf11e275f1c06f9b705585ae3bbe7)
4 files changed