Updated from global requirements

Change-Id: Ifcc0bfe758a78ad2658bc819261bb6f6a253525d