Updated from global requirements

Change-Id: I792874c5e8bc6665c5c92e6817859bbfbfc0fdb0