The autoInsertedEnd flags need to go on the open tag (not the close tag).

Change-Id: I661d45dfc1e01f203ed152268cc6e24ac36d6aaf
Merge "The autoInsertedEnd flags need to go on the open tag (not the close tag)."