Updated from global requirements

Change-Id: I788ce464277bc2f3aefe2544fef4531a14ec3404