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

Change-Id: I9e4770632d233d0b05d6892b5a69f2020ff908e8