Merge "Add secondary counter in place of tls_nodelete flag"
am: aa922bbaf3

Change-Id: I3cd08fea09a2b6a410c10415d70fa3766d6f1f86