Updated from global requirements

Change-Id: Ib096b86c8938c238f95fb8073ffe0b9b1816599a