Updated from global requirements

Change-Id: I1155f67196b5a8393ff53361ac9c63f3f7c23ad0