Merge "Adding testing functionality for TAG_ROLLBACK_RESISTANCE" am: 28a7fed681 am: dddf75c01b
am: 28446e0722

Change-Id: I1d5fa3b8af22808720ac9f03743aa617df967714