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

Change-Id: I2b14b19594e4e5393df707fef3e48bad3adee869