Updated from global requirements

Change-Id: Ie85a32b87417f34b9852b231a4fb0dfcf303e991
Merge "Updated from global requirements"