Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev am: d58c6978a7
am: 9e14ef5c67

Change-Id: I42494b9ee5ffae3bc9bdf0b2451eef36c42881a6