Updated from global requirements

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