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

Change-Id: Ia8866d0584d7a27f229d701d0c2d989dad3c1197