Updated from global requirements

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