Merge "AOD: Skip prox check if cached prox value available" into oc-dr1-dev