12.5 update

Change-Id: Ie7921baf3998a0d759df1d1ee69f839eb82cf7b4
Signed-off-by: ezhayix <lucky.zhao@ericsson.com>