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

Change-Id: I618be0eb195c3a3abcceb01d08c3f159b6c6a016