Updated from global requirements

Change-Id: Id185bb8f180f169072a821b95a774a297db8db1e