Updated from global requirements

Change-Id: I69691b91755ec8c38ef70bd471d1f6f0d4e42f4c