Merge "Change requestWait API according to request" into oc-dev