Updated from global requirements

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