Merge "Use ArrayList as children" into oc-dev
am: c7a31d1970

Change-Id: I094414b00ff540cd7e388db4b1581f0c3c09d49f