Updated from global requirements

Change-Id: I73f40a5fd569d0a5e341aabbece1885a7478d7f5