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

Change-Id: If2d2705df193223cf5c542c4d7270cf5e29f6bb3