Merge "AOD: update AOD2 views to spec" into oc-dev