Updated from global requirements

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