Merge "Add new shim apex signed by a key with rollback capability"