Updated from global requirements

Change-Id: I64d0f0241626d166d4f396af19f3d047d4eee7a6