Merge "AOD: update AOD2 views to spec" into oc-dev am: 146293b35c
am: 60c0420907

Change-Id: I7db2fc62ca26c3c5b89e37b529b18c783a4ef3bd