Updated from global requirements

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