Merge "Use sequence number to check if to reload atrace tags." am: 445234c76c am: d371ad8665

Change-Id: Ic57e29442cfc905444a4f14983a39aa67e01a80c