Updated from global requirements

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