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

Change-Id: I7377848132c5334f0becc640ea82255ff41dee7c