Updated from global requirements

Change-Id: I7a233c45fd21076c9d2b0a46292323bf73524328