Merge "update PRE_DIAL_WAIT in old system API"