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

Change-Id: I95700acbdde479969de9edc50dfab0f9c4c6564f