Merge "Fix another test race in test_update_restricted"
tree: 415aa6b54f93f4a6caf8d316a5988f693d8d2955
  1. common/
  2. functional/
  3. scenario/