Merge "AOD: Fix layout" into oc-dev