Updated from global requirements

Change-Id: Ie03659997dba4e415c2499f5e88ac95ad53f295c