Updated from global requirements

Change-Id: I30b63fc22d4c97af3be4ce64f24d9418a38d26ab