Update GlobalBlocking to master

Bug: 58934

Change-Id: Icc47a2d6367c0b906e40e068635c9fda07108e0f