(no-ticket) Tag tr is closed improperly

Change-Id: I38fad742e5fedff50c2ec5ee3339f3888360b43f
Merge "(no-ticket) Tag tr is closed improperly"