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

Change-Id: I79c7612404a468d25230220cb5a8b6c8133f2caa