Merge "AOD: Fix broken triggers after failed prox check" into oc-dev
am: 017f5df1e7

Change-Id: I24e16671751dc46dbd28eef4726e483a5a8bf4e8