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

Change-Id: I44975aa2357d500093600353fe1a7dc28cf54c15