Merge remote-tracking branch 'origin/maintain/5.1' into mtu

Log: 控制中心maintain/5.1合并uos
Change-Id: I29ea23cd7d262d3d65a9b8a0b2463edbf8ce020e