Updated from global requirements

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