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

Change-Id: I08e16bbc83aad8953ab3d0a6067f64157bef3cb2