Updated from global requirements

Change-Id: Iebc7c7a59966a6cc0879c39b61c89fca8038820f