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

Change-Id: I364d217f7447b7b4f4cf7c042e9f26844e245d46