Updated from global requirements

Change-Id: I34a295ab7e89555557d56608667484c6e9a120de