Updated from global requirements

Change-Id: Ice7c658e09fd99e66d38bb0cc8c774711b87feba