Merge "Don't get struct of children of !laidout viewGroup" into oc-mr1-dev am: 4c0e55d0fc
am: a6338b9dae

Change-Id: Ia1b71dbcfd9bc5560aaa810faf26ad9c3244f783