Updated from global requirements

Change-Id: I345b8dc10d9e136d0cb63cd979840ff1799f0976