Updated from global requirements

Change-Id: Ifa619b1589942e4a81bd04c47ec8cfb239416a9f