Merge "Add ROLLBACK_RESISTANCE definition to for KM4" am: 6ec7a6f455 am: caad59f000

Change-Id: I992c7daebd7c460073c2de00d2e83a7da1ea8db5