Sync requirements with globals

Change-Id: I1af1fb3002b56b0d6f7b8d60e123f8f85c4eed96