Updated from global requirements

Change-Id: I7724427b68627853bbff368834a24a993ef723bf