Updated from global requirements

Change-Id: Ib38f89fab93355b9f0c37e048b1980d4b7fb522b