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

Change-Id: I19a3ca83efc1934448e1044b9be74087f89dd030