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

Change-Id: Ifbcaaf8d580e5c55016040e9bdc5afd27ebcefd6