Merge "AOD: Fix layout" into oc-dev
am: f84b208a12

Change-Id: Ifd1cc55308896a69a805d80d56f321eb272d8bf8