Updated from global requirements

Change-Id: Iea965ff051b96422529c9a2c065b332c88f0a529