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

Change-Id: Ifeab125f760be55dc0ccfe6eb463df9439bf8bb7