Updated from global requirements

Change-Id: I93c18057c2118b51fd08ec28cd908534fd4802e6