Updated from global requirements

Change-Id: I43ebb5c913f5937fc2bc219d15c7380e269b59a5