Merge "Don't add other's child as header or footer" into oc-dev am: 9e37a2e419
am: 9227334834

Change-Id: I07df9ddb7136e7018b0be1d2dfaa1c7f589e0df2