Updated from global requirements

Change-Id: Ie9ea577f35f1eb6fc71876be0d4f721887f1d769