Updated from global requirements

Change-Id: I84c8bae9370f6b99d061ce1dc9519c6bec2b3cad