Updated from global requirements

Change-Id: I03d8d4b89746a59701db875e42c260a3492f911a