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

Change-Id: I383dae263347ea0719bbbb8af07e6d0a665aee27