Merge "Revert "Don't add other's child as header or footer"" into oc-dev
am: 6e0332f308

Change-Id: I088c65f866de6a9df51784865531b0cc44ea4248