Fix error with extension tags for automatic header and footer

Change-Id: Ib142b5ff4a4624a3a90a88e49390279162120fd2
Merge "Fix error with extension tags for automatic header and footer"