Merge "[Bugfix][API-652]change the minimum wake up time" into MR3.0