Updated from global requirements

Change-Id: I15553b6ee020bc906f10d18f9f2f1cf96cc95e65