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

Change-Id: Id181cefb682aba4ff3066e9f08fe77db424f8b0d