Updated from global requirements

Change-Id: Iab5eee131a59928346fc584f399617b4b9bdb031