Updated from global requirements

Change-Id: I9f49c7efdbc3d967f6dc02b799568bc5e56dad50