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

Change-Id: Ia89613aac856b104b32394d6040aa4694327cf55